From: Carlos Garnacho <carlosg@gnome.org>
Date: Sun, 13 Feb 2022 09:56:28 +0000 (+0100)
Subject: shell: Shuffle ifdef to fix !HAVE_SYSTEMD build
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~530^2^2~17
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=57d681863ac847f44b2914c4fb9798e17ffb4c9f;p=gnome-shell.git

shell: Shuffle ifdef to fix !HAVE_SYSTEMD build

The internal SystemdFlags enum is used from common code for
both systemd availability cases. Shuffle it outside the ifdef
so it's seen everywhere.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2177>
---

diff --git a/src/shell-util.c b/src/shell-util.c
index a33686813..aeb81a1aa 100644
--- a/src/shell-util.c
+++ b/src/shell-util.c
@@ -515,12 +515,12 @@ shell_util_get_uid (void)
   return getuid ();
 }
 
-#ifdef HAVE_SYSTEMD
 typedef enum {
   SYSTEMD_CALL_FLAGS_NONE = 0,
   SYSTEMD_CALL_FLAGS_WATCH_JOB = 1 << 0,
 } SystemdFlags;
 
+#ifdef HAVE_SYSTEMD
 typedef struct {
   GDBusConnection *connection;
   gchar           *command;